Implemented Aishwarya's comments