merge peter code