latest updates to match template
merges from windows