need to preserve eventValues