Moved window to core