Adjust some func