Small Updates to Functions