[update]Updated changes according to pdf by chelsea