add new clases and edited other