Adding logic check...