Streamlined and added a "Put it back together" functionality