Updated for a couple of updated modules