Completed Thomas feature