updated to latest wmcbrine changes