modularity enforcement 8330533