Refined advance/retreat mechanic