Changed the application to better work for each operating system