changes according to new doc