resync with current code