[PATCH] INPUT: move to use the new class code, instead of class_simple