Movement diamonds

Re-fixed persistence of movement diamonds.