Modifications requested by Leo