Refactoring of Rise/Fall table