close #25 much faster now