to be modified after discussion with Jay