Incorporating suggestions and changes, including Joel's new function.