Added all required checks