Improving : now it works