[FOLD] Updates based on review