Changed to create time filtering