first small modifications