update to properly generate messages