added timeline and other new stuff