Added more functions and changed string concatenation.