Gentle Modifications on .osx up to line 310