Finished SPB changes, adding CJL