New version less dumb