v6 redo by nj1234 | SimScale