changed message merger a bit