update from matts comp