Finish revision of p374 pending testing