some magic added