Fixing the parts I broke