Resync with main code