timelineing
final changes