Last commit on phase 1