Changed movement rules

Specify it with attributes rather than an inline eval formula