Changes from comments