applied tony's edits