Adjustments to run on TIM