Modifications for IOS version