More responsive improvements. See #1043