extended the example as well as the vapi