Refactored current_xxx_number to xxx_num