NOTE : seems ok now