Little changes in #2