Done with model close #4
CS fixing