with a few corrections