Challenge 1 updates, plus invented extra credit