Changes according the Yuta's review notes