Revised after suggestions