added switch for viscous tensions, finally