timeline is much better but still seems a bit wonky