Lots of changes to magic web