Nick: minor updates to integrate prototip