One more modification for multiple windows