stuff got updated and I'm merging