updated message handling in track model