Just reorder code to match the display order
Action flipflip (untested, to be removed when going to 3.x)
Add long detection of changes, incomplete