refactor timeline, bacteria
merge