Added some additional challenges so that there is at least 6 of each type.