Apply new model changes!  Fix #18!