kTimeBuffer to constant and small changes