Minor modifications done!