merging in my track layout updates