Important changes : now it seems to work quite fine :)