some changes and addings