Upgrade magickly

LGTMs by:
* Michael