harry updates
merged conflicts