updated Tool class, needs parsing