fix problems that were causing stage 4 of approach to never end along with other possible problems. needs to be tested
Merge branches 'version2' and 'temp1' into version2