+ added some magic