Rearranged funtions in the file