simplyfy tracking and add update with msg function