Made some modifications on linux machine