ADD an enhanced test tool
MOD a bit faster update & final - TESTED