adding changes according to harman suggestions