updated based upon 2012 mac config