suggested changes from Troy