improvement by cwolf | SimScale...