made some changes requested by Dan from Ragetracks