Finished the rest of the methods