Same functionality, just a little cleaner