switched over to the new separated model (even though TD automatically merges them)