added class, script and whatnot