edited model
edited views