review and fine tune by Peter