Branch 'VADER' - java/code