Merge with Tyler