changed for ios8