[IMP] change code as per specification