Simplified the application to one file