Added more of the new ios implementation