Fixed First stage. And removed unused stuff.