some edits from ryan