Changes based on Peter's review