Changed a few things around in overflow check