added string handling