some modifications asked