updated with tonight's hw