Now accepts step format as well.