still stateful layers, but at least universe bug is gone