Updates to support ios7/8 simultaneously