Removed DATA STORAGE and made Add Clip and Remove Clip in line with all the major requirements.