changed some class names, replaced & char