Added some magic...