added back the checks on address actions