String manipulation added