Added OSX condition to @CP