Finished 2 methods