some changes made by Rajath on December 1st