More quick hacks for feasibility study