Respond to comments from yatil