resolve comments from Elisabeth and Dmitry