added expand collapse