Limit steps for consistency & out team switch perf