added truncation length in more places