added changes in #6