added more tools from salsan