Improved specs a lot