Modified the files to work for both mac and linux