Changes for 1.8, better cleaning