Backup commit for refractoring