Moved calculation of T6 marker speed to core