Better movement
Merge branch 'myswamp'