Some changes to gauss
merging