Improve further; close #24