Actually made a little more readable with attached issue TIM-1