Updates for XP11..50 - backwards compatible?