JABBA - Update To New Format