Upgrade mohawk/hawkrest