first working version, problem with uppercase in class fixed