small hacks, need to test zpu stuff