Changes suggested by Mitch