Some improvements and one more sample.