Implemented objective 1