Working on iPhone Version for 2.0