These two have been modified for increased functionality and for typos.