Better Auriol 01/2013 handling (checks, timing)