Continued working on iPhone version