More iOS7 optimization