Some enhancements applied