some forgotten changes... hopefully good changes.