simplified modules, fixed collisions