added string expansion