Updated extensions by Emily Short.