updated model and editor