commiting version of Dec14 from Rajath's gem as of 18:28