Time for safety and consistency. (4th August 2009)