Hi I am considering enroll my daughter to Primary one next year. First choice would be Whitesand PS. I read earlier thread that P1&P2 were in PM section. Is it the same now?