Finished remaining functions