Adding internalWindow and externalWindow