architecture improved, message flow improved