included the suggestions by Laura and JJH