Fixing our SHIT