integrated Andreas' comments