more progress
some changes