Switch to more constrained wall generator