incorporated suggested changes from Gabby Choonoo and Clint Olson