Edits from howard