Replaced some previous changes that were accidentally updated...