Eric other changes