fixing all da shiet