Updates from first review