Update my code to latest from wbbaddons.