Edit as per external request