Addressing changes as requested by @guenter