some changes and additions. No code added yet.