lots of changes -- helpful