Merged to use JI stuff