minor edits for our needs