added expand.all functionality