Moved mandatory hw out of optional challenges