VERY HUGE IMPROVEMENT, time should be earlier i think so needs a retime but ggs