update to support svg and etc...