Version 1 of most models
fixed merge conflicts