It has been changed, when the water-part has got more thrilling, since it offers chances for young people to have fun and spend time outside in lively activities eventually bringing violence to the holiday.
Songkran in Thailand has never been the same, when people focus on the water war. Water fight for fun is not wrong, but it is just non of Songkran prime spirit.