update stuff close #6