Improvements based on Volker's feedback