Removed duplicate var + faster movement