several changes from kai