Updated model, and an experiment with window builder