more advance work before full GitHub switch