small model revert; re-add window to model scopes