added string checks