[IMP] make changes as per specification