Upgraded to run on Mavericks