update
inserted more hacks