Finished off ios conversion