modules is tightened up further