Lilach's review
accepted easy changes