Adapted upwind so that it can be controlled via the editor