need to align version control variables
need to align version control variables