Enhancements by bmoc