Changed everything back to the original code...

except the `class_name` fix