going thru steps and minor edits