Implemented comments by @eteq