more hacks added