Updated to handle JB data