Updates according the new comments by Dmitry