- moved the auto address logic around