Updated Waila and JABBA