finished unifying templates