some changes and additions