Working for mac now