Change attr to receive address
merge