changes in #1