updates to ensure well formed