Added ITD and clean up