updated to latest JB code