Updated changes to handle concatenation