added some hacks