Simplify design substantially