added randy's stuff