finalising the changes told by Mubasahar Sahab