Pulled in a bunch of changes over the last few months