iOS working again after refactor