adding two new modules and changing modules to use forked ones instead of cloned ones