Fixed Project setup