WIP: small optimization to predict