change after Peter's response