added some strign handling