Slight modifications from the Mac