Last commit for phase 3