Altered this for inclusion into puppet on all the OSs