updated with ios support