Modified files with suggestions and made it cross platform