changes according to latest requirements