notice added, some modifications expected