Changed somethings to make it more inline with the qualifications of the project