Step logic more zero-based