Changes To All Functions