iOS side is more or less caught back up with Mac side