incorporated suggestions from Allison