New version based on brief notes