updates to fix 8200