Updates to 2.0 (projects on SAFE)