Improve #1