incorporated suggestions from allison