another big offline edit SORRY ;_;