refactor and update for a working combination of tools