Updated for change in Window orientation tags
Updated for change in Window orientation tags