Removing some of the assumptions about the environment to get this runni...

...ng on

other computers