Changes from feedback