Last minute hacks for our Use Case