based on 2016 curriculum revision