Refactoring + time bar added.