added some Hacks