more edits as per spec