New Updated Brance

Updated Branch commit with bug fixes for new iOS created bugs.