Fixed, including all bonus tasks