Continued to work on IPhone version
Continued converting for IPhone