Updates from comments