Change some functions and added one instruction