Upswing repo shared with Alex and melvin on (23-7-2013). Contain all the updated code