Basic changes working on mac