Review changes from daffie