Tweaks to ModelController; algorithm is still wrong