Simplified the project...