some changes from kai