Better logic in has passed?