more hacks for now