refactored numbers (addresses)