Fixes 4001
Added timeline