Some enhancements on the desgin