Made improvement suggested by Laurel.