Basic re-design concept.