added the rest of the tools with env support