Final changes Exercise06