Now checking for general ending as opposed to just date ending