Update to skip this step code so it works with new configuration