match JB changes