Updates based on Cory's feedback