added some magic