Additions suggested by ojar