added timeline and cleaned up unused code