Update tracking and WIP message