Simplified the project a little bit