make more tools work with new yall structure