Upgrade jiffy
Refactor