Incorporated HAR-WLE enhancements