Changed expanded? method