Changes according Yuta's review notes. Part 2