merging with wenting
merged in alex stuff on detail page