Code is up to date with iphone version