Changes according to Bill Thortons requirements