In progress tweaks to proto.