rewrite for new assets API