Move method and some updates