Refactored, working time added