Slightly altered movement, removed unused imports.