mods complete except for output formatting