Completed remaining functions