some progress
some changes