payload and timestamp tweaks