Updating Task02 by Marc