conversion to new api
more useful example structure