Changes according Yuta's review notes