updated from rMBP