update for new modules, and unnecessary steps