updated classes and views