Further work on adding iPhone support