make homework workflow work well as before