update with latest hacks