tweaked, and close #1