Jade fix
Upgrade
Refactoring