Improved highlight and shift