Everything modified and put back together

(click to close)