ENH: Better AV timing by moving on-flip functions
FIX: revert unnecessary change