Code review
Updated project settings
Code review