review changes by @liz0