Fixed data reference issues, should work in any window now.