close #1, and update model representation