Improvements for 2.1.8 pro