Working... with hacks for blocking