added import statements & improved moving