Add better IOS handling