Tried to get closer to upstream/master with my local branch