Improve Colin's #2 and #5