Updates for 1st release of the tool