some changes at first