refctoring - external streams still unhandled by the K2 solver