Modern Update

Before

After