haoxuany's Homework commit