Minor changes for it to work with windows machine at workplace