Minor changes to model and corresponding changes to PM.