Make more reasonable the time keeping