Today
merge from meta_shift