major changes to incident model and form