simplified tools a little