update to hopefully finish merging with testing2