Make the order of the functions consistent