few changes and additions