user interface updated, close #24