First update after fork. Code seems to be working correctly.