modifed the application to include lot of stuff