Change the order of the functions