Updated version, resynchronized