Martin, your suggested changes are OK with me but I am no expert on advection or time stepping schemes. Best to discuss these with Jinlun. Also could you leave old lines commented-out in the code for reference. Dimitris