UPDATED the project to properly reflect the spec