Updates to Auto Functions