Please comment with possible improvements.