updated position handling like a BOSS!