Changes suggested by kdaudjee