expand and collapse - revisited