387.14 Aligned controller code (for now)