Removed yield hack, window no longer using template