Added things for phase 1