hacks here and there :)