#27 almost all magic fixed