Topic: movement improvements