added expand and collapse
added expand and collapse
deleted extra code