UP: Final (hopefully) changes before PR