view changes
javascript changes
model updates