expansion done (wimpy version though)