Changes from comments of PR