updated from 1/21 work on MBProRetina