fixes for the new timeline