update with alex + mattson