Updated to include systemtime