Comments added, Plus working time now