Added some magic shit