Finished remaining methods