This looks a little cleaner.
Update this again.