modify by nicolas