add improvements
conflit chelou