final changes (without a database)