refractor to work with new git clones