matt's changes