Made check optional