Awesome changes

Please take them.  I'll be your friend forever.