basic upgrade to MW1.24 commits