Refined movement rules