trying to merge joe's changes