Added linear and quadratic drag forces