some model and view changes