Better way to handle __updateTimeStamp