a large set of changes to try to address loaded of local modules