making some progress with the update for the rest of modules