Added some magic