Minor chanages removing a stupid hack