reflected review comments #111