upgrade to fix some issues, bad me