Made some upgrades. Before /After. Let me know your thoughts.