more matt changes