Resync with my current code