Exercise7 final commit