Merged works and added suggested changes to Pie