Working on fancy_expand