Added necessity check