Updated with suggestions from Kelly