Major update for ios6