Steps are no longer hardcoded