3245 - further streamline layers
3246 - no, avoid changing the semantics of run