added some magic!