added more polymorph stuff