Pulled from working apple g4 cube

Tested