adjust some code