Changed order of ops. Testing on hpmc right now, not sure if it is correct or not.