Updates from more comments