Reworked overly complex design.