Update to jj's_definitions