Major update to the apple stuff