improved WIP modeling for the core engine - part III, complete!