Updated project a lot