Replacement for version 10.2, step 2