added notes
made some magic