Exercise7 updated