Updated with suggestions from Melanie