Updating the design to something reasonable.