Updating new code as on 10/9/2014