Further amendments based on Tayler feedback