updates from Stephan Mueller