Added Andrew's suggestions