Incorporated Kamran's suggestions