Switch to simple design