Added number checking and status