Change code accoding to review