Fixing the rest