vapi fix
Latest changes in debuggin