Final changes before bag