rebase my changes on top of Apple's