Added classes...
Changed one class