combined files from Hans/Stephen September 6th