Right code for both versions.