Fixing new, messed up old