add two hacks