*8787* Finish jnovak submission