Update to clean 3.0