Improved System Compensation 17 Dec 2015