Made some changes to nesi tools so that everything work as expected