merged in mods from prototyping