Updates from Matt's fork