some changes+