updated to latest output of scala stuff