Adjustments suggested by Alex