revamped for Feb 2014 Mavericks re-install