Better tool

Signed-off-by: Damien Zammit <damien@zamaudio.com>