Revised prototype #71
merge