Ivan code revision