Incorporated suggestions from Michelle C.