Improved unit specs."