Reorganised Assignment1