Committed first part of the updated mods