Modification to reduce use of vospace
fix merge conflict