Updated the suggestions of Vijay and Rajesh