some hacks added