Updates after working on it with Matt