Updating to include all of Kevin's changes