Revised cfd model
Revised cfd implementation