Better sound handling