Added serial number check