Cedric's review
Some enhancements