Modifications from comments