enhancements and renaming
fix conflict