Making changes as per suggestion of Elizacat