Adding in some magic