Before

Almost After.

(Just a few more changes to go.)