updated to reflect changes in other scripts