Deputy Education Minister Datuk Chong Sin Woon said the proposed revamp of remove classes in national schools will encompass all aspects and not only the curriculum. He said this will include the focus on improving the command of Bahasa Malaysia and English of pupils from vernacular schools before they enter Form One.