a few changes and additions