Updated Position to follow conventions