Final changes before PR