enhancements for CEP-986