Simpler re-design