non-local comments added