Exercise6 update