New timeline changes/fixes