made some changes
lotsa changes