CVS commit by mueller: - make dynamic updates in