rich update
cleaning up collectionview
rich update
cleaning up