Updates from Kam's review