blackbox/whitebox separation delayed until M7