Final Changes. Project done