Moved some things upstream