Already done but also need a baa with vapi