some edits from dad