FIXES SDEV-398
Finished LATE TOOL and also fixed SDEV-394