fixed timeline stuff