Particular hacks for original project