edits based on bmispelon's comments