Adicionado JackPot e refactor weak