Added in changes into iOS version