New from mini
Merge from MBP