Added the rest of the functions