Magic

Lots of changes to magic: