With baffle plate by dbsjoden | SimScale