Improve modelling realism