amends from  code review