Today
merge from hopper_protection