fixed all this shii