Change N3830 to N3949.  Add scoped windows.