stomp old api with new api
some tweaks