switching back to address-based to see if travis likes it