edit comment
merge amey's edit and mine