Updated freaking math