Merge branch 'ready/more-magic'