working on People section
merge