further enhancements for release