Commented, one bug question

in expand