Updated to move time and timestamp