[PR] Changes after review